Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

swayfx compat changes #84

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

swayfx compat changes #84

wants to merge 6 commits into from

Conversation

WillPower3309
Copy link
Member

This PR contains changes to scenefx related to the swayfx rebase (WillPower3309/swayfx#367)

@WillPower3309 WillPower3309 marked this pull request as draft December 7, 2024 01:47
int width = output->width;
int height = output->height;
struct wlr_buffer *wlr_buffer = NULL;

if (*fx_framebuffer == NULL) {
if (swapchain == NULL) {
printf("swapchain is null\n");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Return early here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops must've pushed a debug change

@@ -565,6 +568,7 @@ struct wlr_renderer *fx_renderer_create_egl(struct wlr_egl *egl) {
wlr_egl_unset_current(renderer->egl);

get_fx_shm_formats(renderer, &renderer->shm_texture_formats);
printf("made renderer\n");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should use wlr_log instead

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oop that was a debugging print I think

@@ -2421,6 +2421,11 @@ bool wlr_scene_output_build_state(struct wlr_scene_output *scene_output,
timer->pre_render_duration = timespec_to_nsec(&duration);
}

// TODO: we need to revisit this, this is a stopgap to ensure we can resume swayfx rebase
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this feels wrong. We should sanity check this with scene upstream. How do they handle the case of output swapchain not being enabled here? Are we missing an initialization on the swayfx side?

@@ -565,6 +568,7 @@ struct wlr_renderer *fx_renderer_create_egl(struct wlr_egl *egl) {
wlr_egl_unset_current(renderer->egl);

get_fx_shm_formats(renderer, &renderer->shm_texture_formats);
printf("made renderer\n");
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oop that was a debugging print I think

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants